diff --git a/tests/phpunit/CRM/Mailing/MailingSystemTest.php b/tests/phpunit/CRM/Mailing/MailingSystemTest.php
index ab1d28c165..049dba67c8 100644
--- a/tests/phpunit/CRM/Mailing/MailingSystemTest.php
+++ b/tests/phpunit/CRM/Mailing/MailingSystemTest.php
@@ -72,6 +72,10 @@ class CRM_Mailing_MailingSystemTest extends CRM_Mailing_BaseMailingSystemTest {
   }

   public function tearDown() {
+    global $dbLocale;
+    if ($dbLocale) {
+      CRM_Core_I18n_Schema::makeSinglelingual('en_US');
+    }
     parent::tearDown();
     $this->assertNotEmpty($this->counts['hook_alterMailParams']);
   }
@@ -130,6 +134,10 @@ class CRM_Mailing_MailingSystemTest extends CRM_Mailing_BaseMailingSystemTest {
     ], 1);
   }

+  public function multiLingual() {
+    return [[0],[1]];
+  }
+
   /**
    * - unsubscribe used dodgy SQL that only checked half of the polymorphic
    *   relationship in mailing_group, meaning it could match 'mailing 123'
@@ -145,9 +153,10 @@ class CRM_Mailing_MailingSystemTest extends CRM_Mailing_BaseMailingSystemTest {
    * - in certain situations (which I have not been able to replicate in this
    *   test) it caused the unsubscribe to fail to find *any* groups to unsubscribe
    *   people from, thereby breaking the unsubscribe.
+   * @dataProvider multiLingual
    *
    */
-  public function testGitLabIssue1108() {
+  public function testGitLabIssue1108($isMultiLingual) {

     // We need to make sure the mailing IDs are higher than the groupIDs.
     // We do this by adding mailings until the mailing.id value is at least 10
@@ -155,6 +164,9 @@ class CRM_Mailing_MailingSystemTest extends CRM_Mailing_BaseMailingSystemTest {
     // Note that creating a row in a transaction then rolling back the
     // transaction still increments the AUTO_INCREMENT counter for the table.
     // (If this behaviour ever changes we throw an exception.)
+    if ($isMultiLingual) {
+      $this->enableMultilingual();
+    }
     $max_group_id = CRM_Core_DAO::singleValueQuery("SELECT MAX(id) FROM civicrm_group");
     $max_mailing_id = 0;
     while ($max_mailing_id < $max_group_id + 10) {

diff --git a/CRM/Mailing/Event/BAO/Unsubscribe.php b/CRM/Mailing/Event/BAO/Unsubscribe.php
index 1bc8995138..36499300e4 100644
--- a/CRM/Mailing/Event/BAO/Unsubscribe.php
+++ b/CRM/Mailing/Event/BAO/Unsubscribe.php
@@ -143,6 +143,10 @@ WHERE  email = %2
     $mailing_id = civicrm_api3('MailingJob', 'getvalue', ['id' => $job_id, 'return' => 'mailing_id']);
     $mailing_type = CRM_Core_DAO::getFieldValue('CRM_Mailing_DAO_Mailing', $mailing_id, 'mailing_type', 'id');

+    $groupObject = new CRM_Contact_BAO_Group();
+    $group = $groupObject->getTableName();
diff --git a/CRM/Mailing/Event/BAO/Unsubscribe.php b/CRM/Mailing/Event/BAO/Unsubscribe.php
index 1bc8995138..36499300e4 100644
--- a/CRM/Mailing/Event/BAO/Unsubscribe.php
+++ b/CRM/Mailing/Event/BAO/Unsubscribe.php
@@ -143,6 +143,10 @@ WHERE  email = %2
     $mailing_id = civicrm_api3('MailingJob', 'getvalue', ['id' => $job_id, 'return' => 'mailing_id']);
     $mailing_type = CRM_Core_DAO::getFieldValue('CRM_Mailing_DAO_Mailing', $mailing_id, 'mailing_type', 'id');

+    $groupObject = new CRM_Contact_BAO_Group();
+    $group = $groupObject->getTableName();
+    $mailingObject = new CRM_Mailing_BAO_Mailing();
+    $mailing = $mailingObject->getTableName();
     // We need a mailing id that points to the mailing that defined the recipients.
     // This is usually just the passed-in mailing_id, however in the case of AB
     // tests, it's the variant 'A' one.
@@ -185,7 +189,7 @@ WHERE  email = %2
     $mailings = [];

     while ($do->fetch()) {
-      if ($do->entity_table == 'civicrm_group') {
+      if ($do->entity_table === $group) {
         if ($do->group_type == 'Base') {
           $base_groups[$do->entity_id] = NULL;
         }
@@ -193,7 +197,7 @@ WHERE  email = %2
           $groups[$do->entity_id] = NULL;
         }
       }
-      elseif ($do->entity_table == 'civicrm_mailing') {
+      elseif ($do->entity_table === $mailing) {
         $mailings[] = $do->entity_id;
       }
     }
@@ -212,10 +216,10 @@ WHERE  email = %2
       $mailings = [];

       while ($do->fetch()) {
-        if ($do->entity_table == 'civicrm_group') {
+        if ($do->entity_table === $group) {
           $groups[$do->entity_id] = TRUE;
         }
-        elseif ($do->entity_table == 'civicrm_mailing') {
+        elseif ($do->entity_table === $mailing) {
           $mailings[] = $do->entity_id;
         }
       }